NetworkMenu: use Connected instead of profile name for wired and wwan

The profile name is most often not useful (because it's an
autogenerated string like "Wired Connection 1"), and even when it
is, it's already available in the submenu.

https://bugzilla.gnome.org/show_bug.cgi?id=725586

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 32e177ea2e739be44071d5d9866a426a0285b503..b159e3cf84b452837ed8e2178eeecadec3d49c41 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -236,16 +236,6 @@ const NMConnectionSection = new Lang.Class({
         return this.getIndicatorIcon();
     },
 
-    _getStatus: function() {
-        let values = this._connectionItems.values();
-        for (let item of values) {
-            if (item.isActive())
-                return item.getName();
-        }
-
-        return _("Off");
-    },
-
     getConnectLabel: function() {
         return _("Connect");
     },
@@ -424,7 +414,7 @@ const NMConnectionDevice = new Lang.Class({
         case NetworkManager.DeviceState.DISCONNECTED:
             return _("Off");
         case NetworkManager.DeviceState.ACTIVATED:
-            return this.parent();
+            return _("Connected");
         case NetworkManager.DeviceState.UNMANAGED:
             /* Translators: this is for network devices that are physically present but are not
                under NetworkManager's control (and thus cannot be used in the menu) */
@@ -1455,6 +1445,16 @@ const NMVPNSection = new Lang.Class({
         return _("VPN");
     },
 
+    _getStatus: function() {
+        let values = this._connectionItems.values();
+        for (let item of values) {
+            if (item.isActive())
+                return item.getName();
+        }
+
+        return _("Off");
+    },
+
     _getMenuIcon: function() {
         return this.getIndicatorIcon() || 'network-vpn-symbolic';
     },